projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6f2064 085a587)
bitkeeper revision 1.1159.212.54 (41fac89fnck8lIgXT0fcIHlQ9aM_7Q)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 28 Jan 2005 23:19:59 +0000 (23:19 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 28 Jan 2005 23:19:59 +0000 (23:19 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
tools/libxc/Makefile patch | diff1 | diff2 | blob | history
tools/libxutil/Makefile patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/Makefile
Simple merge
diff --cc tools/libxutil/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.